branch, re-adjusting errors out, rather than losing that merge commit.
* sync: When another branch has been manually merged into an adjusted
branch, error out rather than only displaying a warning.
- * initremote: When onlyencryptcreds=yes is used along with
- embedcreds=yes, and encryption is enabled, only encrypt the embedded
- creds, without encrypting the content of the special remote. Useful
- for exporttree=yes/importtree=yes remotes.
+ * initremote: New onlyencryptcreds=yes which can be used along with
+ embedcreds=yes, to only encrypt the embedded creds, without encrypting
+ the content of the special remote. Useful for exporttree/importtree
+ remotes.
* Don't allow the type of encryption of an existing special remote to be
changed. Fixes reversion introduced in version 7.20191230.
* tahoe: Support tahoe-lafs command versions newer than 1.16.